Multiple bug fixes - see comment

Fixes for the following issues:

https://issues.jboss.org/browse/SRAMP-233
https://issues.jboss.org/browse/SRAMP-230
https://issues.jboss.org/browse/SRAMP-232