More fixes that jaxx56 messed up.