Fixed warnings from -Wall