putting fixes for S8