Fix points noted by ne_Sachirou.