Factories: fix method return types