Fixes in standard registry