GCP-6163/64 layout fixes