Fixed several issues esp related to updating