Fixed some newbie conflicts