more margin fixes (now that it's 940 again)