WIP
Misc fixes
WIP