Fix in issues as of May 21 (#2,#3,#4,#5)