Fixed some minor leftovers