[PATCH 0/4] Some small registry access fixes