Release 1.2.1, two Android crash fixes