Minor fixes of cleanup