Small changes for v2.0.0 support, also for res fix