Solving 3 first issues from #750