Removed errors/warnings