Some fixes for monsters