Unbound fixes

Found lots more unbounds during my strict testing.