Additional fixes for SRAMP-384

https://issues.jboss.org/browse/SRAMP-384