Fixing issue with demo warnings;