Misc fixes

Good catch, reverted.