Severral fixes