Temp commit - some RA fixes