[WIP] Fix/osky fixes

More to come as I test.