More fixes for monsters