WIP: various precommit fixes