Fixes for high f cells