[WIP] Various Fixes

Includes my previous PRs