Two fixes

See commits