2013.08.13: Fixed some long outstanding issues