Fixup Standard SMC Resume Handling and some code alignment problems