Minor changes to prevent simple-schema warning