Fixed warnings for GCC -Wpedantic