Fixes to Bathtubic.