generation fixes