Fixed bool/Bool and other issues