Fixing bugs that caused ... not to get passed around