MInor updates to SPA module