Fix strict violations