Cleaned things up so that we don't get any warnings anymore.