Some tweakings.

cc @timlinux