Minor changes
A few more changes