Fixes to Remy section