Minor updates for initial state of SPA