refs #7561 Minor changes introduced to deal with workspace pointer

 problem. Do not fix this problem but left just in case (like formatting changes)