Fix strict standards & refresh for latest SCB