Final changes for 1.3