fix remaining class/struct warnings