Little changes on 1.3.1