Minor updates to SPA and Service