Fix part of warnings reported by introspection