fixes for BSF demo