Fixed some staff