Fixed issues from -Wall