Fix more stuff
Minor changes
Merge changes