Fix build hanging after completion