Fixes from CR