Improvements for docker debugging as per issue #3