minor improvements for cross building