Changes based on feedback for Dotcloud deployment