couple of fixes in MRClientBuilders.java