more temporary fixes until session is implemented