Changes for 1.2alt