Outlining fixes