more derps fixes