Points minor improvements