Fixing _Accept and other bugs