Small changes for BNAIC demo.