Small fixes + add some debug traces