Small fixes for non vets