Fix datasource and classpath issues