Some fixes for Rpub submission