Release 1.2 bug fixes