Fixes, switch to neutonclient