destroy fixes