v1.8 build for 0.90 and minor fix