fixes for stem layout