Fix for clang error
Fix some problems reported by CLANG