Fix some little nonsense to get it working on new box.