Fix: Some problems with optional projects/customers