Fixed changes from 1.2 testing