Fixes for code generating tools.