Fix stuff wolv pointed out