Tweak explicit and implicit layout injection