Small nit fixes