Adjust rune type processing to match with last commit