Anubis: corrections and small optimizations