Oops
Misc fixes