Restrict compounds
Fix bugs