Core/Misc: Some fixes