BugDuck

Bug Fixes from ducks merge