Updates from Ryo4. Fixed compilation error.