Fixed up models in prep for adding OGG support