Missing libaio, more tidy up