manager fixes