A few more bugs I didn't catch earlier.