Fixes and release 1.2