fixes to work with CM snapshot