Fixes from the trenches.