mavericks

Hey Mike- don't close NVTY-41. This is only a partial fix, but it might take awhile to figure out how to fix the other parts. I want to commit this now because Nativity can crash without these fixes.