Fixes from mentor session on 2-04-14