Minor functional updates