Various fixes
More fix attempts + logging