Fixed more bogues