New attempt of quickstart fixes, to see if the CI sever likes these better