Fixed other issues