Moved debug blocks to machine package