Add more descriptions
Fix build breakage