Various minor change requests