Fix return + strip args