Changed some greps to be case insensitive