Fix up blatant issues with session state not working