Removing old patch
Fixing failing ports