fixes for demonstrator