Updated smlib and some 1.7 fixes

No merge yet