Minor fixes todo with moving things around.