Fixing some derby mistakes