Fix errors caused by having a : in layout