more fixes argh