More fixes for R15