Merged some errors