Two fixes

~~