Some more small changes to investigate problems...