A couple small fixes