Fixes for some build errors.