More stupid coding fixes