All: Final clean up and fixes from testing