Various tweaks after building a small CDH cluster on clean machines