Fixed 3 issues

#960, #962, #963