Merge Missing Commits

Some stuff left out