CMO3553 fix + some minor fixes