bug fixes for aerogear demo