Fix lint/build errors