Fix helper classes