Some changes to make PCUI work.