Code clean-up allowing for cherry picks
Minor fixes