Images and Java Fixes