two little bugs fixed