* minor flus: cleanup and fixes