Layout conversion fixes.