Fix setuphandlers