patmos: addressing some comments