Cleanup and fix modules and images