Some fixes to monsters