[WIP] Fix os instances

Fix os instances