Fix some broken elements like missing unit names