Jwang various fixes