Fixed derpy issues