Fixes for the current stable Framework Version