More capistrano-3 compatibility fixes