Minor changes to case insensitivity