Some last minute tweaks to get things working on the cluster