Minor functional changes