Added fixup for various boot2docker bugs