Some fixes.
Merge branch '4.3.4' of https://github.com/Hezekiahqt/Core into 4.3.4