fixes to rental flow