Small fixes
Store access token between restarts