Fixes to get SimplePush working.