Fixes, per https://github.com/mozilla-b2g/gaia/pull/9521#issuecomment-17643784

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>