Bunlde of fixes and clean up.