Fix Pippin's issues