Fixes...a lot