fixes for compilaion. Rediscovering the wheel.