Various incremental improvements