fixed build errors in combinations, cosmetics