Demo fixes for 7.