XIB identifier fixes