make-up and small JPA-corrections