[C43] fixing some issues