Fixed Peter's fixes. Now all works fine.