PR & lint fixes

Follow-up for #34