V2.1 small fixes