[PATCH conductor 11/24] Misc rails 3 related changes