non-mac fixes