Fixes from CR #1