ISSUE-7 Reduce compiler warnings