A few fixes to support before/after/around hooks in specs