Updates for general migration to 13.10