More bumblebee/docker support