Fixed more mistakes masked by using version installed on my system