fixtures, minor fixes