Bugs 55, 59, cleanup