on destroy fixes