Various Figure-Save fixes