minor tweaks in mock backend