[enh] Small fixes