Asked in the bug. Will update when I have the answer. Thanks.

The other nits are cleaned up too.