Fix macro names
Clip pieces properly