Fixing some issues with recent API changes on Github