Fix BaseConstants