Fixes to allow code to run on TomEE

Changes as noted on the deltaspike dev mailing list.