Fixed typedef redudencies