Hopefully fix compilation issues