Fix some obvious mistakes