Minor changes and fixes