Add cookie warning
Fix merge issues