Misc fixes!