Minor fixes from Justin