mergec minor changes from live

Benjamin Mako Hill || Want to submit a patch?