V1.2.0 snapshot

The last two problem fix.