Started RAM usage fixes