Fix for a couple of issues in r243.
My project still takes crazy 2-3 minutes to save, and my pc freezes badly in that time