Fixed the errors causing crashes in the initial release