Some refactoring & bugfixes related to compiler version