Misc changes
Some more small changes