Additional debug warnings were added