Fixes to be compatible with ubuntu saucy (older api)