some stupid fixes