Fixes required for local (not cluster) mode