[#1002] Code fixes to changes