Fix some retarded errors