Fix demo programs