Fix Issues with PebbleOS 2.1