Fix issues 2/3