Some half-baked changes