Fix 1 jira and 1 bz, plus some other improvements. All pretty simple commits