Fixed Java 7 issues + resources stacking