Small fixes from conflicts

fixed a couple little things I missed the first time around when
resolving the conflicts.