2 bugs fixed