Fix some issues with new drawer fragments