Fixed 3 issues

#889, #907, #915