Miscellaneous Builder fixes