Small fixes to XIB and super