Fixes for the jassa demo