Fixes to description system