Fix awfully stupid wrong typing of return statements