Further SMC bug fixes.