Fixed some quirks left after quickstart