Fixed return types