Corrections and alignment with MP-511

https://issues.jboss.org/browse/AGPUSH-973