fixes for possible demo