Miscelaneous v1.0 changes