Re-implemented fixes after Merge