Added java.policy + Some small fixes