Minor fixes to old project