Misc cleanup on demo