Additional clean-up and fixes on top of existing fix