Fixes on ocurrences and stuff