Update problems found by Gerd