NAnnie performance tweaks