More updates for a cleaner run