Both these issues should be fixed in -current now.
Yes, I can confirm the problem is fixed. Thanks. -- - Brian