Improve Rook spec compatibility