Minor hub fixes