Fixing several bugs/config issues that did not show up in master due to the current serialization working better than the one in master