some fixtures improvements