#13 Clean warnings