Some fixes introduced with the previous commit (Left overriden accidentally, not updating)