no-cookie fixes