remove warnings and add base pc92 handling