CommitPage cursor fix
registration hacks
StorageFactory hack