Fix some surprised errors