Fixing helpers for java 1.7