Last changes before OSX broke