More work on 98 support