Some changes to bring inline with 1.3