Fix #483#484

pschachte merged 2 commits intomasterpschachte/wybe:masterfrom

local-obj-fixpschachte/wybe:local-obj-fixCopy head branch name to clipboard