Fixes from testing with client model.