Fixed some bugs found while writing code overview