Fix broken specifications
Use forked BuildSystem