* Minor changes and fixes