Couple small fixes