New SerialVersionUID and more API fixes