Some changes for a 1.x release