Fixed return type of some more sharedInstance methods