Better XML Base handling