Fix lint and parser issues