fs-base fixes for windows