Cleanup and fix exec name