More fixes and more logs