minor bugfixes on registry