demo bs fixes