Equalize some less relevant stuff with master