Various pending changes and fixes