Fix bird and collectible positions