Fix compiler warnings

Created originally on Bitbucket by dmilligan (David Milligan)

Was already merged in Bitbucket before import, marked as merged by the import user

Source changeset not longer availableat the time of import. Commit listwill look empty