minor updates from latest bbb generator