Issue #1 - Some fixes after the merge