I8: Fixed some errors