Fixed return type warnings