Fix build system errors.