Fix various odd cases