Fixed two minor bugs SOAP-933