MDCore tweaks for my needs