Removed warnings and memory tweaks.