Fix rookie errors