Minor size improvements