Misc fixes

we'll have to solve this