More fixes found while playing