Veterency fixes