CU-2 Fixes from code review in Github