Gcc fix
Potential workaround for #677
Missed these for gcc
Merge branch 'master' into issues_L