fixes for cookies