Small cleanups 1

Post rebase