Handle some reload scenarios

Needs testing and thinking