A few tweaks that seem to help initial layout