Okay some more cascading fixes