Baseband tweaks