New Fixes all over the project