Fixing build while working out bugs