Fixing a few bugs from presentation, Ivo and other findings