Bug fixes in dummy.c