Couple of changes, fixes