Some minor changes in api