Fixes suggested by peregrin and mst.