Include changes from bsavoy's most recent changes