Bugfixing and return to self managed cookie handling