Fix build issues for s6 related custom fragments