Fixes, other horse stuff