Improved Mavericks compatibility