Beta1 fixes - indexing optimization