Fix compilation errors and restore load/save arrangement stuffs