Actually fix buildable_to nodes and update for protection support pull