Adding minor missing pieces