Fixes. So much annoying bugs.