Code fixes to address compiler warnings