Several fixes/updates