Some minor changes

Waiting for merge