Monster fixes

* Fixes #1203
* Fixes #627