Fixed mistakes C08