Changes I'm submitting to the moai-dev repo.