fixes and standardized behavior over OS X