Fixing more monkey crashes