Fix some monkey tested bugs