Changes for newer Rapture dependencies