Fixed bugs so it handles named instance properly, suppress unhelpful warnings