Some improvements to margins