Consolidated some errors