rsser fixes