Fixed more issues with included generic modules