Minor Changes. Need to create a few files to make BlockPipingBundle
happy