fixed checks when using Werror, cosmetics