Cleaned up warnings and errors.