Fixed some minor issues with API v2