Resolved cml swc build errors and warnings