Tweaked library order (core last)