- Several fixes