Got rid of some findbugs warnings + reworked parameters for fsm handlers