Both points are fixed in commit @dfd38ce.