WIP
websphere fixes