More fixes based on monster tests