misc changes to be rebased