Staff: fixed some problems