fixing Werror, etc