Fix few tiny thing