Some quality improvments