Minor tweaks for macba