Reduce buildtime for jumpdrive, Closes #515