Fixed some const version functions