Fixes all over, these never ending fixes… -_-