Small fixes for RAF loading