Fixes by the dozen