Fixed some compiletime issues.

Who knows if versioned horse stuff works