some incremental fixes