Found a few more small fixes