more incremental fixes