Changes to states to deal with new oslo logging and whatnot