Minor fixes to tpollak's commit
3 files changed