Some minor changes/fixes