Don't need MemoryFree library
Added fixes