Final fixes on AnyRaptor