Du's bug fixes