Continued build improvements