Makes changes to when things get included; fixes issue with calling of methods that don't exist