Finish the changes to silence warnings