Fixes

See Individual Commits for Details!