Force swap on all models, and fixed rakefile