Fixes for upgrade to maya cluster