Monkey-patch buildFragment signature changes and clean edge cases