Build fixes for newer ubuntu.