fix some derps

Staging: git will be fixed later.