Fixes and temp cookie fix