Registry fixes