Eliminated some errors