Fixed some points issues