Fixes visibility and static methods