* Minor changes and fixes
