Fluid tweaks and cleanup