Some minor internal changes