Mafia fixes