Merge branch
Minor fixes due to the merge process.... which is uhh a thing