Several fixes and stability