Corrected some warnings/errors.