A couple important fixes.