Street Fighting Grandma: just fixes

fixes