more -n fixes