Fixed vouchers so you can add FP as voucher
Various fixed to rental and other components