Fixing helper classes