HQNX fixes + reverting of OS X specific updates