Couple ExtensionMethods fixes