Minor clean-ups after demo.