Tweaks from BraveKernel