More fixes and logs