Minors improvements to Docker check logic and compatibility