Fix strcmp and other small changes