php5-fpm-integration: Several fixes + refactoring
Other: Small fixes