more fixes to make the OSX Finder work, including locking