Fix visibility of globals in layout