Random bugs fixed