Fixes related to description