Switched to simpler compile args fix for older compiler support