more stupid fixes