Save 13

Minor fixes