Fixes for android + updated dist/demo