couple fixes for OS1