Bug fixes in Deploy-Application-Code