Make the hacks more acceptable to gcc