Minor changes/ bug fixes