WIP: Misc fixes