1. and 1a. are fixed in 8fc679bf,
thanks.