Fixes for Pebble OS 2.1