minor improvements to Long