various: Wipe up some minor errors