Coffee changes and fixes.