Couple small adjustments