Another fixes (yeah, stupid comment, but anyway...)