Compatibility fixes, save functionality completed