Two fixes from Martin Jansa <martin.jansa@gmail.com>.