a few models fs fixes