Fixed all remaining build errors.