Fixes as asked for by Martin.