Minor changes and clean ups