CR200 more fixes