Cleanup barb placement logic
Fix bug preventing tail placement