Some minor changes and ENV vars