Fixed warnings and readded -Werror