A few minor fixes to improve integration with ABRAID-MP