Bugfixes and MyFaces compatibility