GPII-228: Fixed a few more errors