Two issues fixed (see details)

https://issues.jboss.org/browse/SRAMP-264
https://issues.jboss.org/browse/SRAMP-267