WIP
websphere fixes
SF