191114 Last fixes