Misc fixes following basic testing