Minor changes and updates