Fixed few minor bugs with CSC and Dispatcher modifying HEAD