Various bug fixes (addendum)