Fixing some monkey crashes