Jonny likes camels  ;)
Fix deprecation warnings