fixes for model and path