Fixed some const