minor fixes for OS support