Tiny bugs fixed