Issue #203: Fixes CLANG warnings