The use of panel data models with two-way fixed effects is widespread. Incidental-parameter bias, however, invalidates inference based on the (profile) likelihood. We consider modifications to the likelihood that yield asymptotically-unbiased estimators as well as test statistics that are size correct under rectangular-array asymptotics. The modifications are widely applicable and easy to implement. Through several examples we illustrate that the modifications can lead to dramatic improvements relative to maximum likelihood, both in terms of point estimation and inference.