Some build fixes for ubuntu raring