Fixed some minor build defects.