Some final setup fixes.