more #14 fixes