Fixed a few issues with aoebgone