Another threesome + small fixes