Some factory tweaks