Several Confluence minor bug resolution