More derpy fixes