Fixed jira 115 and 100 bugs.