Fixing stupid mistakes from not testing...

Syncing changes that fix previous commit... too eager to sync with
dunjinwah