Yes, in several of these instances, it would not hurt the balance (with no major technical issues I guess) to follow a bit more d&d 5 rules...