Fix some last build issues on guests