More fixes with veresion 1.4.7