Some fixes + refactoring