Fixes much fixes