Fixes some build warnings