Coffe format fixes