fixed remaining build/run issues