Two little improvements