Fixing more warnings/errors.