OSX fixes, minor video fixes