Clean up details causing errors