Minor changes for new arch build, handling console only login and such