Fix bug introduced while moving files around
Enable building of 1.9.3 and pass -j2 to make