fixes for session and language settings