Several Fixes for Generic and Delegates