RV-333: bug fixes and improvments