Some fixes for being functional on another box