lint: Fix several issues from regression tests