More nit picky things