Fixing some issues with standalone.xml