Some different addons and minor fixes

Should be tested with public and other streamwrappers.