Fixes for build errors.