Just a couple small fixes