Merging in fix for cogs types from master.