Fixes for some problems due to renamed IDs in layout XML files.