Rails2 improvements for master