async fixes
jdk7 support