Spec file fixes for the Broker and Node