Fixed some issues with case differences