Core/Misc: Some changes to reduce differences with 4.3.4 branch + some cosmetic changes