Street Fighting Grandma: fixes

fixes