Fix bub in Layouts and typeahed of perm time