[B] Bugfixes for Marci's email of 2013-03-15