Fixes: extra load/save robustness and Linux compatiblity