more fouc fixes!