Fix some minor leftovers