Couple small changes