Fix warnings/errors about