Few more fixes to support slave reads!