Fixes for fillDescriptions