More usecase tweaks.