Fix setup to play nicely with Ubuntu 12 server