Changes to facilitate Moby+Ravelin