Some minor tweaks. Working on less notices.