Small improvements to topcoder: 13147