fix: correct data type and update missed constant references
Co-authored-by: Duncan Brown <duncan@bhs-consultants.com>