Debug source install issues

Not for immediate merge