Fixed things mentioned by the great @xabbuh