Fix points 1 and 2 of #434