Fix more coffee strangeness