fixie
fix remaining build errors