Fix some issues from golint